Merge "Fix #29737133 : content-trigger jobs not running properly" into nyc-dev