Temporary fix to entity OptimisticLockException on update