Feature/rnair/bees 26