Fix volume global sharing save and dirty

Fixes #2660
Merge branch 'staging'