Nickolay Olshevsky

@TJ-91 Could you please resolve conflicts here? I'm not seem able to push to this branch. Thanks!

@TJ-91 Thanks. Windows and lint CI failure must be fixed via the PR #2282, so it seems another rebase would be needed once that PR is merged )

@TJ-91 there is some merge conflict here.