merge back 0.3.x-dev state