PR #6855

PR #6855 is not in the merge queue.