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

This reverts commit f009ed53dec29b4486bcb4ce75acf9f15ff0cd70.
Rebase from 'upstream'
Trimmed the branch to only the asmach sub directory