20131217 - Sync with Wooden's OSD work, ADC CLI