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

This reverts commit 6bb997d1e5aaaa7608f54502d96f38eae1f55f4f.
Rebase from 'upstream'
Trimmed the branch to only the srdf sub directory