2.3.0 ccs

Jim, are you interested in merging this in?