Align on 5.6.0-HF39-SNAPSHOT