Sweeping !24584 from 21.3 to 21.0. Cherry-pick updates to Trigger ART tests from master
Cherry-pick updates to Trigger ART tests from master
See merge request !24584 (merged)
Cherry-pick updates to Trigger ART tests from master
See merge request !24584 (merged)