Add overlay[local] annotations
#21116
+220
−21
Draft