Merge branch 'sb/submodule-helper'