Security fix

cherry-pick it to develop and other branch please.