Merge branch 'bug_9631' into 3.12-master