PR #6960

PR #6960 is not in the merge queue.