Merge branch 'bug_9748' into 3.12-master