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

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