refactoring + 2008910 + 2006911

Dianne Nowack requested to merge cypress_dataTest_dn into 2022.0.0_cypress

Merge request reports