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

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