Fixe problem with save changes in ref set edit mode not turning edit mode off afterwards.
Merge branch 'master' into develop

* master:
  Fixe problem with save changes in ref set edit mode not turning edit mode off afterwards.
Fixe problem with save changes in ref set edit mode not turning edit mode off afterwards.