issue #23168: bring back oauth shell
issue #23168: move out dependencies