Merge commit 'origin/template' into build
drwxr-xr-x - etc