Merge branch 'bug_9925' into 3.14-master