Feature/us 34254 round2