Fix merge 1.4 branch