Align on 5.6.0-HF21/5.6.0-HF22-SNAPSHOT