Control Panel: menu changes
Merge remote-tracking branch 'origin/1.2.0a' into 1.2.0a