case-3589 - Menu iphone issues
Merge branch 'case-3589' into development