PR #6948

PR #6948 is not in the merge queue.