Align on 5.6.0-HF29/5.6.0-HF30-SNAPSHOT