Align on 5.6.0-HF31/5.6.0-HF32-SNAPSHOT