Ground work for displaying exception templates
Merge branch 'development'