Merge branch 'hotfix/index_restrukturieren' into develop