Merging 1.4 changes into my master