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

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