PR #6880

PR #6880 is not in the merge queue.