PR #7271

PR #7271 is not in the merge queue.