update with wangjun 20140522 23.10

update with wangjun