Merge pull request #2246 from BrzVlad/feature-concurrent-evacuation