Import 3.14.4-1 changes