merge to ver 25

see details in craving ver 25