Merge "Store ETWS primary information in the database" into rvc-dev