Merge "Add row-based API to SPA search"