PR #7134

PR #7134 is not in the merge queue.