PR #7267

PR #7267 is not in the merge queue.