Feature/revised/riak cli handoff status 1239