Bazaar

As per your request, I'm sending again the MR on development branch.