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

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