CON-1446 | more CR changes