Merge branch 'wl-locale-merge' into locale_new