Merge 1.4 version