PR #7275

PR #7275 is not in the merge queue.