Merge "Add multi client ror support"