Fix datamodels for version 2022.0

Richard Wohlgemuth requested to merge datamodelfix_2022-0 into master

Merge request reports