Merge "Add new datagram type sms" into main