Revert "Trimmed the branch to only the mr_tools sub directory"

This reverts commit 2b171ffafb61e2dca63b048f53e422560703444e.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the mr_tools sub directory