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

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