Align on 5.8.0-HF03/5.8.0-HF04-SNAPSHOT