Merge pull request #9659 from ynezz/upstream/ci-improvements