Merge branch 'fix-genex-HEAD-target' into release