It looks like branch-2.1 and branch-2.0 need commit 5469535090 "lib/odp-util: Do not use mask if it doesn't exist." Any objection? (It's possible, though I think it is unlikely, that this fixes the bug that Duncan reported.)