PR #6970

PR #6970 is not in the merge queue.