PR #6786

PR #6786 is not in the merge queue.