Sweeping !50807 from master to 21.2. Fix DF-level matching to match 'default' matchingCloses ATR-24269 (!50847) · Merge requests · atlas / athena · GitLab

Atlas Nightlybuild requested to merge cherry-pick-6b5ff3f004b-21.2 into 21.2 Mar 01, 2022

Fix DF-level matching to match 'default' matching

Closes ATR-24269

See merge request !50807 (merged)