Align on 5.8.0-HF20-SNAPSHOT