CON-1282 | update #2 after CR