CONN-1092 Applied review comments.