Mitre enhancements

Merging of tools branch and fog_dev branch into single mitre-enhancements branch