CON-1709 | after merge fix