Merge branch upstream/8.0 into 8.0