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

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