Merge pull request #2802 from BrzVlad/feature-evacuation-opt2