DC21-305: Add package filename and id to template file