PR #7005

PR #7005 is not in the merge queue.