Sweeping !38979 from 21.2 to master. Support more generator setups

Support more generator setups

See merge request !38979 (merged)

Merge request reports

Loading