Align on 5.8.0-HF27-SNAPSHOT