fixed NS issue, extended dcp mockup

Hannes Raddatzrequested to merge
cherry-pick-9aaa0a01 into main

(cherry picked from commit 9aaa0a01)

Merge request reports