trying to fix this in r2_index to contain merged master stuff