Merge branch 'ph/submodule-rebase'