Fixed race condition during saving

madtisarequested to merge
f/support-maldives into master

that corrupts a save if an event happens during the saving process (e.g. gifting event)

Merge request reports