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

This reverts commit a6d7e89bd5c19c1c751c7791d0a03efca061978d.
Rebase from 'upstream' @ version '0.3.21'
Trimmed the branch to only the manipulation sub directory