Merge "For tagging snaps 6.0.0"