Merge branch 'bug_8745' into 3.14-master