Update to CLI 2.3