PR #6845

PR #6845 is not in the merge queue.