Merge "Change unnecessary List usage in TRM to Set" into rvc-dev