PR #6816

PR #6816 is not in the merge queue.