Add changes from 2.1.4 that never made it to git. Until now!