Implement attribute handling during context merging #2599
+27
−17
Merged
Loading