Align on 5.8.0-HF23-SNAPSHOT