Merge branch 'py/submodule'