switch to original master brunch with fixed small issues