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

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