2.0.x

Fixes for CLR bindings in 2.0.x branch.