Merge branch 'pu/pb/index_refactor'