Align on 5.8.0-HF14-SNAPSHOT