Merge "Handling group chat sender" into sc-dev