Merge "Visit IMT of all classes during image writing" into nyc-dev