PR #7219

PR #7219 is not in the merge queue.