Backport checkds to 9.16

Matthijs Mekking requested to merge 1126-checkds-v9_16 into v9_16
Edited by Matthijs Mekking

Merge request reports