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

This reverts commit 570225a9b664d92ffa32cfb6e697698726e3d723.
Rebase from 'upstream'
Trimmed the branch to only the trivial_features sub directory