Merge pull request #873 from dusk-network/leftovers