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

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