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

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