Feature/mie 825