PR #6972

PR #6972 is not in the merge queue.