Merge branch 'bug_9126' into 3.12-master