Align on 5.8.0-HF07/5.8.0-HF08-SNAPSHOT