Merge "Add noha scenario in CI"