Merge branch 'jk/initialization-fix-to-add-submodule-odb' into maint