Feature/3295 custom error pages