switch to WithAngleAndTemplate
switch to WithAngleAndTemplate
Merge pull request #3773 from dr4kan/WAATemplate

Reco -- Switch to WithAngleAndTemplate