Merge branch 'tg/index-struct-sizes'