Premerge commit, structural changes (added template files), preview fixes