Part 1: 2301239 Removed @todo as menu tree manager is plugin.
Part 1: 2301239 Removed todo to give rebuild a better name.