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

This reverts commit d2584c23895d8e8e5eddfa0cbf66348e2cda10f0.
Rebase from 'upstream'
Trimmed the branch to only the backtrack_behaviour sub directory