Add overlay[local] annotations
#21116
+402
−74
Draft