PR #6992

PR #6992 is not in the merge queue.