CONN-1161

Resolved issues found during QA of CONN-1161