remove cda stuff from plugin resource
turn on query conversion for 2.x
merge master