Merge branch 'bug_2832' into 3.12-master