Merge branch 'bug_9791' into 3.12-master