PR #7215

PR #7215 is not in the merge queue.