Merge "Fix RS matrix docs regarding row/column and x/y."