PR #7004

PR #7004 is not in the merge queue.