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

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