Issue #2141119 by kim.pepper: Refactor to use MenuTree service