Merge branch 'bug_9905' into 3.14-master