update for next oe-a 2.1