Merge branch 'master' into feature_layout_controller
- menu can be enabled now by property menuEnabled
Merge branch 'feature_layout_controller'