AdHoc: Port to new Assistant

Fixes #10314
2 jobs for master in 8 minutes and 59 seconds (queued for 5 seconds)
Status Job ID Name Coverage
  Test
passed #21975
code-quality

00:06:43

3.0%
 
  Build
passed #21976
linux

00:02:16