Adding code fore preparing reports from mtrack
Finally fixed all merging and cherry-picking