Debundeling @metadata patch (issue #115)