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

This reverts commit 578623e5dd73260aa2f233c44ba61348e9f1f203.
Rebase from 'upstream' @ version '0.3.20'
Trimmed the branch to only the interface sub directory