Editor's drafts for tfpauly-patch-1 branch of yaroslavros/connect-ip-optimizations