Merge branch 'ak/submodule-sync' into maint