PR #6965

PR #6965 is not in the merge queue.