fix items missed in cherry-pick
Merge remote-tracking branch 'dlech/submodule-support'