Updates to documentation, regarding in-flux design decisions around templates.
Merge with head
Merge with head