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

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