oa-645 extend 3.x classes to 2.x grid