CON-1282 | update #3 after CR