Cherry pick changes from 2.x #1992
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Main changes are
The following commits were cherry-picked:
Cherry pick c3a95fa
Cherry pick 82a1370
Cherry pick 98d4fb9
Cherry pick c3f5274
Cherry pick 1166567 from parent 1
Cherry pick e32907d
Cherry pick fd783bf from parent 1
Cherry pick 3350b07
Cherry pick 7d3044b
Cherry pick 1d6c173
Cherry pick f8eb790
Cherry pick 6fe6205
Fixes #1992