Merge branch 'bug_9358' into 3.14-master