Merge 1.70.0-hotfix branch into master.