Merges DataModel 21 and 22

Fixes #2329

/cc @sendhil  + @astralbodies