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

This reverts commit 8a7177da14e3af698dc64b55ef239da39af61faa.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the simple_message sub directory