update for 0.20 RC1-1