A note: neither patch adds VAB support to the CLI, only to the python-client.