PR #6950

PR #6950 is not in the merge queue.