Merge "Set the propert CLI_MODE env"