Merge pull request #4675 from kumpera/runtime-scalability-take1