Feature/bb 1.0.59