Align on 5.8.0-HF15-SNAPSHOT