Merge "remove security related code in reset" into 2.0_beta