cherry pick it to 1.0.x and then we can do a release 1.0.1 with the change.