Hi,

Pushed as 4bd880624978dfd0c14c7f751b8b725c2d2e7d22 to master.

It's compbined work from <https://issues.guix.gnu.org/56474>.

---
Oleg