Align on 5.6.0-HF36-SNAPSHOT