UPD: optimization of migrator
Merge pull request #1041 from angel-kulikov/master

UPD: optimization of migrator