Align on 5.8.0-HF17-SNAPSHOT