squashed commit of row updates from caf