Align on 5.6.0-HF25/5.6.0-HF26-SNAPSHOT