Merge branch 'bug_9629' into 3.12-master