Merge "Fix NPE when indexing changed lines" into stable-2.10