Feature/ll 832