Merge "Fix the tempest error when creating snapshot"