Merge "[MCR] Render multi-slot diffs"