CON-1233 first round of CR fixes