Align on 5.8.0-HF35-SNAPSHOT