Bring in 0.14.4 changes