Merge master
Merge templating
handling bundle
Merge dev-master