PR #6901

PR #6901 is not in the merge queue.