Fix race condition with GVP loading from persistent storage
Merging origin/bob/master-pending/gvp-init into master