PR #7375

PR #7375 is not in the merge queue.