Merge 4.14.6 into 4.14.7