[1.x] DataCollections improvements

[caendesilva]

Tie-in with #1732 to make the upgrade smoother. See #1712

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 99.95%. Comparing base (0bcb9f7) to head (f184d58).
Report is 4 commits behind head on master.

❗ Current head f184d58 differs from pull request most recent head 2ad9e59

Please upload reports for the commit 2ad9e59 to get more accurate results.

Additional details and impacted files

@@            Coverage Diff            @@
##             master    #1733   +/-   ##
=========================================
  Coverage     99.95%   99.95%           
- Complexity     1747     1749    +2     
=========================================
  Files           181      181           
  Lines          4670     4675    +5     
=========================================
+ Hits           4668     4673    +5     
  Misses            2        2           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.