@siosm anyway, the PR is here: github.com/systemd/systemd/pul

The PR is almost ready, I just need to add some test cases.

Enjoy.