Sync code pushed back to feature dev

Priyanka Bhongaderequested to merge
feature-m20-solid-principle-priyanka into eds-M20-feature-dev
  • remove_none replaced with iterate records
  • Import statements corrected

Merge request reports