Update ci_stage_3.groovy with the latest changes in master