Merge branch 'bug_9954' into 3.12-master