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

This reverts commit e4ca3dca1ad90551c9c09351810d07dcc442012b.
Rebase from 'upstream' @ version '0.3.21'
Trimmed the branch to only the interface sub directory