Merge branch 'rs/clean-menu-item-defn' into maint