Merge branch 'bug_9625' into 3.12-master