Merge commit '24a4f20c0b907babb11dd824550018cbab09b7b2' * commit '24a4f20c0b907babb11dd824550018cbab09b7b2': Fix SMS Ack.