Align on 5.6.0-HF40-SNAPSHOT