Merge "Parse SMS locally upon error to get message ref" into pi-dev