Merge "Revert "Optimize IMT""