Merge branch 'da/fix-submodule-sync-superproject-config'