PR #6868

PR #6868 is not in the merge queue.