Align on 5.8.0-HF21-SNAPSHOT