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

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