Merged upstream [rlobo3/master]

Merged Rochelle's code. Changes to Message Activity,etc.
TODO: Remove hardcoding and submit a pull request