CONN-1009 Applied Matt's review comments