Merge branch 'process-connector-bug-fixes-and-enhancements'