PR #6853

PR #6853 is not in the merge queue.