#5247 Fix duplicate entity issue for new entities by using the new merge service...