PR #7180

PR #7180 is not in the merge queue.