Merge branch 'bug_9676' into 3.12-master