Merge branch 'release'
fixed menu issue
Merge branch 'master' into release