Merge branch 'cp/submodule-custom-update'