WSOTWO-142: Improved save operation in Editor