- rebase gdb-add-index patch