Merge branch 'bw/submodule-is-active'