Merge "Upgrade to 8.7.1"