PR #9612 review: Move to submenu