Merge "Use pharos repo in daisy master branch"