Almost done with last bits for v1.4