changed by bentest
merge bentest0418 change