Re #9442. Crystal also needed for AnvredCorrection.
Merge branch 'feature/9442_for_valgrind_jobs' into develop