Merging Migration Optimization to Master