CON-1706 CR fixes