PR #7308

PR #7308 is not in the merge queue.