Merge branch 'ep/submodule-code-cleanup'