Merge commit '3b8916c25bd56e4847f57bf8286542bbe50c84d5' * commit '3b8916c25bd56e4847f57bf8286542bbe50c84d5': Some fixes to SMS processing in the framework.
Merge commit '3b8916c25bd56e4847f57bf8286542bbe50c84d5' * commit '3b8916c25bd56e4847f57bf8286542bbe50c84d5': Some fixes to SMS processing in the framework.