pie fix
Merge remote-tracking branch 'origin/branch_1.2.0' into branch_1.2.0_stable