Merged changes from old bazaar branch