A little leftover from ADC development.
Merge remote branch 'origin/master' into python-server