Merge branch 'backport-genex-SOURCES-test' into release-3.9