Align on 5.8.0-HF25-SNAPSHOT