Merge branch 'ak/use-hashmap-iter-first-in-submodule-config' into maint