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

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