Update stable havana branch