OC-7835: Readme and cli switch update