Improve single origin template parameters
Improve single origin template parameters

These were some of the changes made in the dettached certificate branch that hasn't been merged

PRX/Infrastructure,PRX/Infrastructure,PRX/Infrastructure,PRX/Infrastructure,PRX/Infrastructure