Merge 3.12.1 into 3.14.0 and fix the conflicts