* Synch up with wl-2_4 and merged following changes.