CONN-1191

Fixed unresolved merge conflicts