sync with wl-2_10 branch