PR #6902

PR #6902 is not in the merge queue.