Ammended previous merge to more closely follow upstream