Align on 5.8.0-HF12-SNAPSHOT