Fixing the broken CI
Merge pull request #2973 from hovsepm/CIFailure

Fixing the broken CI