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

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