PR #6796

PR #6796 is not in the merge queue.