Align on 5.8.0-HF28-SNAPSHOT