Integrate a changelog update from master branch to release-0.8.6