SWC-1250: fix concurrent update handling, and edit state when there is an error on save