PR #7158

PR #7158 is not in the merge queue.