Merge cis havana staging