CONN-568 Fixed - Ready for CR