Feature freeze for 1.4