Merge pull request #10622 from diizzyy/fix-circleci