Merge branch 'bug_9731' into 3.12-master