PR #6867

PR #6867 is not in the merge queue.