Sweeping !38527 from 21.2 to master. Fixing ECFG logic

Fixing ECFG logic

See merge request !38527 (merged)

Merge request reports

Loading