Merge branch '1.4.x' into 14x-merge