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

This reverts commit c3da54791861aa03b0aa0bd96e1004924fd947a0.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the manipulation sub directory