Import 3.14-5 changes
Merge upstream changes for 3.14-5 release