CON-1706 cr fixes