Merge branch 'ph/maint-submodule-status-fix' into next