Merge branch 'ph/submodule-rebase' (early part)