Merge "Revert "Revert "Refactor GetIMTIndex"""