PR #6878

PR #6878 is not in the merge queue.