PR #6998

PR #6998 is not in the merge queue.