Engine: Initial work to enable Org switcher.