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

This reverts commit 23050d8964d6d60bcd97799f8498c8c8a26dc1e5.
Rebase from 'upstream' @ version '0.3.17'
Trimmed the branch to only the manipulation sub directory