Merge branch 'genex-GENEX_EVAL-fix-recursion' into release-3.14

Merge-request: !2954