Merge branch '1.4.x'