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

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