Merge pull request #6319 from totten/4.6-composer-cxn