Merge "Fix accidental IMT and root marking regression"