Feature/bceastburn/includeviews