Merge pull request #1667 from kodustech/feat/kodus-trace