Merge branch 'bug_9440' into 3.12-master