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

This reverts commit 419ffe03b347d9cd715cc2c7e0f8fef2bcefe0c2.
Rebase from 'upstream'
Trimmed the branch to only the manipulation sub directory