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

This reverts commit 02e1c7ff516ef0287a88fff0ee5c9d954bcdc874.
Rebase from 'upstream'
Trimmed the branch to only the cloud_merge sub directory