Merge "Upgrade to 8.9.16"