Merge branch 'bug_9367' into 3.12-master