Merge "Update the system API to support multi client RoR"