CONN-727: Fixes for skinny wars (not using CONNECT as 'parent')