Merge branch 'bw/submodule-helper-usage-fix'