Merge "Add controller's rpc partition and heal 24h job"