Merge issues with implementing InControl.

Greg: This caused problems with your menu that you’re working on.