Issue #1829308 by aspilicious: Convert variables in menu.inc to config and state.