Merge branch 'bug_9839' into 3.14-master