Bug fix in stage 3 related to repo_base_url