CON-317 CR fixes 2