Align on 5.8.0-HF02/5.8.0-HF03-SNAPSHOT