Merge "Fix for resetting snapshot status"