Merge "block: ROW: Fix forced dispatch"