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

This reverts commit 1fd9a73714918f460d3c6c7a93a21e1bfc5172b9.
Rebase from 'upstream'
Trimmed the branch to only the euscollada sub directory