Many changes in templates and policies

• This is the same MR than !3 (closed) but removed the latest commit which was a mistake.
• All discussions were resolved except a minor problem which will amend in the next MR so I do not screw up this one.