Merge 4.11.2 into master