Merge branch 'master' into v1
10262215 both delete update button totally done