Feature/stor 376