Merge "Add support for dimensions in FRRO" into main