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

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