PR #7001

PR #7001 is not in the merge queue.