PR #6875

PR #6875 is not in the merge queue.