7.6.0 Release Merge

PR to merge master branch into 7-stable for 7.6.0 release.