Resolve "Some Datachecks broken due to new registry obejct changes" Closes #1252 See merge request !1770