PR #7210

PR #7210 is not in the merge queue.