Merge "Add stride query"