PR #7212

PR #7212 is not in the merge queue.