PR #6889

PR #6889 is not in the merge queue.