Robustify the Snapshot creation manager.
Merge remote-tracking branch 'origin/testing' into testing