Commits changes from the havana branch