Merge tag '1.4' into fox