Apply patch 2/2 for submodule packaging
4 files changed