Initial update for 0.40.09