PR #6945

PR #6945 is not in the merge queue.