PR #7072

PR #7072 is not in the merge queue.