PR #6828

PR #6828 is not in the merge queue.