Merge branch 'bug_9432' into 3.12-master