PR #6835

PR #6835 is not in the merge queue.