Align on 5.8.0-HF13-SNAPSHOT