Merge "Full text search: new API, deprecating old API."