CON-1282 | minor update #4 after CR