Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way' into maint