Merge "Fixed an issue where the message could be empty" into pi-dev