[Observe-commits] [Git][ultreiaio/ird-observe][develop-7.x] 2 commits: Integrates back toolkit since we won't use it anywhere else