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

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