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

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