Conn 1345

Commits are incorrectly labeled (typo).  Should be for CONN-1345.

PR also includes fix for 1356.