PR #6788

PR #6788 is not in the merge queue.