fix for menu duplication bug, and update gradle
Merge branch 'hotfix/2.3.0'