New includes for default layout
Merge branch 'development'