Don't work with default criteria.
Minimize the collateral damage.
Merge pull request #1574 from kaltura/IX-9.19.1-PLAT-1669

Ix 9.19.1 plat 1669