Revert "Revert "Revert "Revert "Merge branch 'sam_multiple_index_writes' into sam_multiple_iii_better""""

This reverts commit 48a6864992d9be625e4ffcda8a4b669e36799646.
Merge branch 'sam_multiple_iii_better' into sam_multiple_index_writes