Final stable havana merge