Merge "Revert "Revert "Optimize IMT"""