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

This reverts commit 00daca6b750b1d78d1fbc293b85fa53adc9fd55a.
Rebase from 'upstream'
Trimmed the branch to only the amcl sub directory