Merge branch '7800-make-test-solution-work' into migration-v12

Status Job ID Name Coverage
  Test
failed #8385
lint:js

failed #8386
unit:django

 
No job trace
Test lint:js
No job trace