CHD support update.
2900b12