Merge branch 'ready/templatebody'