PR #6862

PR #6862 is not in the merge queue.