Refs #4202 Menu refactor GO. This one is tricky...
Refs #4202 submodule trickery
Merge branch refactor