Upgrade to 5.6.0-HF16-SNAPSHOT