menuitem & restriction

Merged Luciano Ortiz requested to merge 12.0-sprint6-fixes into 12.0-sprint6

Merge request reports