Merge branch 'bug_9953' into 3.12-master