Pull mv-write-patch-1.3 branch into 1.3 branch for 1.3.3 release