Align on 5.8.0-HF10/5.8.0-HF11-SNAPSHOT