Align on 5.6.0-HF24-SNAPSHOT