PR #7071

PR #7071 is not in the merge queue.