asset tracking updates and restructure
Merge pull request #2236 from ednad/coi_asset_track_patch

asset tracking updates and restructure