GEM:60 fixed the fuckin merge mistake
Merge branch 'web/hotfix/60' into release/next