PR #7371

PR #7371 is not in the merge queue.