PR #7170

PR #7170 is not in the merge queue.