update for 0.20 branch