PR #6871

PR #6871 is not in the merge queue.