PR #7030

PR #7030 is not in the merge queue.