Merge "Support of selecting RIC in dashboard"