Integration branch brought back up to speed