Merge branch 'ph/submodule-sync-recursive'