Fixed menu issue
Merge remote-tracking branch 'origin/stable'