PR #7203

PR #7203 is not in the merge queue.