Merge "fix the CI error"