PR #6968

PR #6968 is not in the merge queue.