PR #6795

PR #6795 is not in the merge queue.