Merge "Add fixes in openci job"