merge master1
merge master1
switch
switch
remove em_thread in rs_count.cc