following trunk upgrade from 0.2.1 to 0.2.2