Merge "Add indexes to speed up queries" into stable-2.14