Getting ready for 1.4 merge