We only had one use-case with a few EntityManager.merge() calls. I rewrote that part so the problematic merge() wasn't necessary anymore.