PR #7006

PR #7006 is not in the merge queue.