Merge branch 'hotfix/hotfix'
Long menu fix
Index release
Fix
Merge branch 'hotfix/hotfix' into develop