[Backport release-1.7] Backport #2158 and #2166 to release-1.7
#2170
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.
Backports #2158 and #2166 to the
release-1.7
branch. As with #2165, I had hoped for a clean backport, but I found on #2158 that that sadly did not occur. Instead, I am re-iterating the approach of #2165, which is a bulk-sync ofmain
torelease-1.7
except for these release-specific files: