CON-1709 | merge with CON-1707