Dev 2023 0 1100251 ds fix

Dominik Schneider requested to merge dev_2023_0_1100251_ds_fix into dev_2023_0

Merge request reports