Merge branch 'bug_9588' into 3.14-master