- Fixed merging of changes into default context after save