Adding latest BZ-side chagnes