Merged upstream: https://github.com/systemd/systemd/commit/3f342ec4b028914fa558855609cd932364558c05 Will backport it.