Align on 6.0-HF02-SNAPSHOT