What would you want to have in `$Ri` and `$Rp`? They have to refer to a local socket, otherwise it may have unexpected side effects for other components.
It should be at least different commits for each major component it changes. You can make it with more commits, it can be squashed from PR web interface as well.