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

This reverts commit 0eb7d7cbe50ce73f01b7bb67ba131ba835959c32.
Rebase from 'upstream' @ version '0.3.17'
Trimmed the branch to only the interface sub directory