CON-1788 | changes after CR