NEW: Menu Updates
MERGE: local master