Engine: Initial work to enable Org switcher.
Merge pull request #3223 from ehelms/engine-org-switcher

Engine: Initial work to enable Org switcher.