Merge 4.5.0 into master