Update and merge from wl-2_10.