PR #7224

PR #7224 is not in the merge queue.