The patch is pushed to the new 2.x.0 branch.
@Shani Maurya, thanks for the pa...