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

This reverts commit 72b02e386244f062992eca9eb3240796b7e83293.
Rebase from 'upstream' @ version '0.3.15'
Trimmed the branch to only the manipulation sub directory