Feature/mc 395 optional local