missing client bug
Merge ../acos-client