Merge branch 'backport-genex-refactor' into genex-refactor

Use the `-s ours` strategy because we've already cherry-picked
the merged commits and resolved conflicts.