Merge pull request #6325 from 1715173329/ci-remaining