Merge menu fixes.
Merge branch 'develop'