Merge "Add unit tests for some text-message functions" into studio-1.4-dev