Feature/gbr 35 squashed