PR #7209

PR #7209 is not in the merge queue.