Delta indexed disabled (and other harmless commits that are already merged)

Obviously I did messed up something because 69e11bb and d9fadb2 were included in this pull request, but they are already merged. Merging should be harmless, anyway.