Merge branch 'bug_9756' into 3.12-master