Merge the changes from the 1.4.0 branch patch