Fix deprecated Supply.more (to .emit)
Merge branch 'nom' into newio