Merge 1.3.11 branch