Merge branch 'hotfix/index_7_style2'
style:
Merge branch 'hotfix/index_7_style3' into develop