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

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