Merging 1.4 changes into 1.3