handling message
Merge remote-tracking branch 'origin/templating' into templating