bring cli work, track against 1.6.0 branch