CON-317 CR fixes