CON-1489 Cr fixes