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

This reverts commit 46756fd18dfca4ef2a16152f0c4b1dea216346fd.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the cloud_merge sub directory