Merge "Tempest for revert-to-snapshot"