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

This reverts commit 9e8a163e88742eb291b83cf796245d5dbf75e446.
Rebase from 'upstream' @ version '0.3.19'
Trimmed the branch to only the manipulation sub directory