Merge 4.9.0 into master