Merge branch 'rb/hashmap-h-compilation-fix' into maint