Align on 5.6.0-HF21-SNAPSHOT