Merge branch 's-havana' into devel