Feature/br 399