CON-1498 CR Fixes