So now we can use snapshots in the affected scenarios, which this commit also implements. Will-fix: #5571