PR #7145

PR #7145 is not in the merge queue.