Template improvements (map -> map.join, ^extends -> extends)
Merge branch 'dev-extends'