Merging changes from havana