PR #7221

PR #7221 is not in the merge queue.