Merge branch 'bug_9727' into 3.12-master