PR #6996

PR #6996 is not in the merge queue.