CON-1442 | Fix after merge