Align on 5.8.0-HF19-SNAPSHOT