Merge "Change the data structure of restrictions in UM" into rvc-dev