PR #6785

PR #6785 is not in the merge queue.