Merge branch 'release/0.6.1' into develop
add template resource id to correctly handle the include in blocks
bumped version
Merge branch 'release/0.6.2'