Merge branch 'bug_9341' into 3.12-master