Editor's drafts for 01 branch of yaroslavros/connect-ip-optimizations