Merge branch 'bw/template-tool-buildconfig'