Align on 5.8.0-HF01/5.8.0-HF02-SNAPSHOT