PR #6971

PR #6971 is not in the merge queue.