Pushed patch 3 to guix master as commit 2dd2210bf9065c9dcc3ec5412776a88b4df0201b.