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

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