Added template execution support
Merge branch 'create_execution'
Added execution_terminate