Merging 4.13.0 into master