[*] Dap client fix
assigned to @naeper
requested review from @naeper
merged
mentioned in commit 099dbdb7