Merge branch 'tr/merge-recursive-index-only' into pu