PR #6900

PR #6900 is not in the merge queue.