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