D2.062 adaptation for debug/tester D subproject

Signed-off-by: Ľudovít Lučenič <llucenic@gmail.com>
Merge branch 'work'