Bazaar update
Bazaar merge