Merge branch 'bug_6506' into 3.14-master