PR #7245

PR #7245 is not in the merge queue.