PR #6994

PR #6994 is not in the merge queue.