Merge "Fix wrong CI_BUILD arguments"