PR #6836

PR #6836 is not in the merge queue.