Last state after rc3-2020 teardown.

Last state after rc3-2020 teardown.