PR #6798

PR #6798 is not in the merge queue.