Merge "Change the indexing bucket size to 250 since it shows better performance."