ZUMO: incorporate final set of Yavor items and other fixes

Committed for Krishnan who is having trouble.