Add new templates
Report exceptions
Add iframe tasks
Merge branch 'master' into metrics