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

This reverts commit 3b6a6803b7ef83120c445bc87059a1ed70e3cc91.
Rebase from 'upstream'
Trimmed the branch to only the lockfree sub directory