Merge "Fix get rics for no type"