Feature/bf/mie 812