Merge "MCR: replace slot_inherited with slot_origin"