Merge changes from topic "rupinsi2-messagerouter"

* changes:
  fixed code smells
  removed code smells