Merge "Add support for multi-RRO generation" into pi-car-dev