Merge branch 'revert-de7fb50d' into 'main'

Revert "Merge branch 'draft/eevidence-crxx5' into 'main'"

See merge request !345