CON-1983 cr fixes