CONN-1206 merge conflicts comments