Merging dev branch into 1.4.1