Changes to fix issue WOLF292
Merge branch 'WOLF292ConnectControlIssue'