Feature/analysis multi fixes