Merge "Refactor RallyBase"