Merge "Update the Pharos template"