Merge branch 'bw/push-submodule-only'