CAS-1439: Fixed merge issues