Don't reload workspace on every save. Still has issues keeping in sync because of NPE
Merge branch 'master' into fix-graph-unselection
Merge branch 'fix-graph-unselection'