PR #7162

PR #7162 is not in the merge queue.