Merge branch 'bc/maint-submodule-fix-parked' into maint