Merging changes from 1.3 and 1.4