PR #6824

PR #6824 is not in the merge queue.