CDB-2891 Bad merge fix