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

This reverts commit d150310d5735d118d416f3502ee7045d4714bfb1.
Rebase from 'upstream'
Trimmed the branch to only the manipulation sub directory