Thread safety bug during snapshot creation.
Merge remote-tracking branch 'remotes/origin/master' into stream