Backport initial 1k node scaling work to 6.1.x branch.
Note: This backport is by customer request, but it is not our intention to fully maintain 1k node support or make available all 1k node support patches on the 6.1 LTS release.
(cherry picked from commit 2fba18e9fb61bfd9270bf3ec15a3d33950157047)
(cherry picked from commit f347ecf77c6c848b724db179561a3c158974b334)
Backport initial 1k node scaling work to 6.1.x branch.
Note: This backport is by customer request, but it is not our intention to fully maintain 1k node support or make available all 1k node support patches on the 6.1 LTS release.
(cherry picked from commit 2fba18e9fb61bfd9270bf3ec15a3d33950157047) (cherry picked from commit f347ecf77c6c848b724db179561a3c158974b334)