CONN-1175 and CONN-1176 Applied review comments