Encode menu changes.
Merge remote-tracking branch: upstream/master