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

This reverts commit 17713a3bcca201c607ead73c2c7da0f17c4a6fec.
Rebase from 'upstream' @ version '0.3.19'
Trimmed the branch to only the interface sub directory