Feature/r2.5.1 getting started