Update Template methods
Merge branch 'master' of https://github.com/FrontOfficeDev/KillSwitch