Merge branch 'bug_9903' into 3.14-master