update ROW from CAF
block: updates from CAF for ROW support