Merge branch 'bug_9613' into 3.14-master