back ported template repo and file service updates