Merge "Add new error code handling for sending short code message"