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.
Description
Manually recreated the changes from #13339 to 16.0, rather than doing a complex merge.
FIXME: the changes are currently not tested, because I am not sure where should we invoke
verifyRestorePositionAndTimeStats()
. The test case inmain
where I was doing this is not present inrelease-16.0
Related Issue(s)
#13339
Checklist
Deployment Notes