CON-980 | Changes after internal CR