PR #7370

PR #7370 is not in the merge queue.