Merged 3.14.4 patches