Fix all the cases of inclusion into wrong menus.
Bump version.
Bump version.