Merge pull request #10886 from hseok-oh/ci/fix_ci_error