Merge "Work on issue #28942589: Tune job scheduler" into nyc-dev