PR #6820

PR #6820 is not in the merge queue.