Merge changes If5c24da9,If5c24da9,If5c24da0

* changes:
  feat(rme/spm): test co-working of rmm and spm
  feat(tftf): refactoring of some tftf function helpers
  feat(rme/spm): code reuse and refactoring