Fix integrity error handling#496

MarcelGeo merged 3 commits into

dev-r84-concurrent-pushMerginMaps/server:dev-r84-concurrent-pushfrom

fix-error-integrity-handlingMerginMaps/server:fix-error-integrity-handlingCopy head branch name to clipboard