[v9_16] Fix kasp system test failures

Merged Matthijs Mekking requested to merge matthijs-kasp-system-test-failure-v9_16 into v9_16

Merge request reports