PR #7009

PR #7009 is not in the merge queue.