MOE_37: Merge cli & etc