Merge branch 'r/1.3.6' into develop
Fix readme header space
Convert templates to filters. Document filters.
Version bump
Merge branch 'r/1.3.7'