yes, I commented about it on the PR description. You prefer me to send separate PRs?

Given that this won't be a simple cherry pick (due to the fact that on master we restructured the modules) dedicated pull request would be nice, yes.