Feature/etk 188