Master merge and broken build fix