PR #6791

PR #6791 is not in the merge queue.