PR #6969

PR #6969 is not in the merge queue.