Feature/gbr 35

Changed