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

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