Merge branch 'main' into 86-cell_cross_index