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

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