PR #6821

PR #6821 is not in the merge queue.