Merge "update to 1.2.2 branch (69c7f16)"