Merge "Add type support to Ric"