Merge branch 'bug_9463' into 3.14-master