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

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