Merge changes from topic "DistractingPackageHelper_tm-dev" into tm-dev

* changes:
  Add DistractingPackageHelperTest
  Introduce DistractingPackageHelper