Merge "Changed to use $(repos_dir) and removed #"