PR #7163

PR #7163 is not in the merge queue.