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

This reverts commit 28561929370b4244b241a537f221a6c35be3e10e.
Rebase from 'upstream' @ version '0.3.20'
Trimmed the branch to only the manipulation sub directory