Pull 2.1.2 into 2.2 branch.